Remove service_token from secret_path for remote ES - #7468
Open
khushijain21 wants to merge 6 commits into
Open
Conversation
khushijain21
changed the title
khushijain21
changed the title
service_token from secret_path for remote ES
Contributor
|
This pull request does not have a backport label. Could you fix it @khushijain21? 🙏
|
samuelvl
previously approved these changes
Jul 29, 2026
Contributor
|
Tick the box to add this pull request to the merge queue (same as
|
cmacknz
added
Team:Elastic-Agent-Control-Plane
cmacknz
reviewed
Jul 30, 2026
| for _, key := range ks { | ||
| // Do not advertise remote ES service_token in secret_paths; Prepare(...) deletes it | ||
| // before the policy is sent to agents | ||
| if outputType == OutputTypeRemoteElasticsearch && key == FieldOutputServiceToken { |
Member
There was a problem hiding this comment.
This should be conditional on the service_token actually being removed shouldn't it? Otherwise we leak the service_token.
Is there a way to do this such that if Prepare changes to retain the token this behaves properly?
Author
There was a problem hiding this comment.
Added the conditional. PTAL when you can
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is the problem this PR solves?
We delete the
service_tokenfrom the parsed policy when output is of remoteES type. See. But we do not remove the reference for it fromsecret_path.output.[OuputID].service_tokenwhich causes constant stream of errors on elastic-agent side when attempting to read the nilservice_tokenThe error logged is
How does this PR solve the problem?
This PR removes the corresponding
service_tokenfromsecret_pathbefore sending the policy to elastic-agent.How to test this PR locally
Design Checklist
Checklist
./changelog/fragmentsusing the changelog toolRelated issues